Merge from stable:
authorMichael Natterer <mitch@gimp.org>
Mon, 21 Jun 2004 16:13:55 +0000 (16:13 +0000)
committerMichael Natterer <mitch@src.gnome.org>
Mon, 21 Jun 2004 16:13:55 +0000 (16:13 +0000)
commit1408c75941c65f3d8ea617884f7894ea8e1240aa
treeb54ae8e9752c360130457c7cee4cdafb6d49e64f
parentfbe92667af3a611dc40a8a45a8d9fbb020fd186d
Merge from stable:

2004-06-21  Michael Natterer  <mitch@gimp.org>

Merge from stable:

* gdk/x11/gdkdrawable-x11.[ch]: made convert_format() utility
function public as _gdk_x11_convert_to_format().

* gdk/x11/gdkcursor-x11.c (create_cursor_image): premultiply
the pixels from the GdkPixbuf when putting them in the
Xcursor image. Fixes bug #144350.
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gdk/x11/gdkcursor-x11.c
gdk/x11/gdkdrawable-x11.c
gdk/x11/gdkdrawable-x11.h